removed leftover CVS conflict markers
authorSven Neumann <neo@src.gnome.org>
Tue, 21 Feb 2006 08:49:47 +0000 (08:49 +0000)
committerSven Neumann <neo@src.gnome.org>
Tue, 21 Feb 2006 08:49:47 +0000 (08:49 +0000)
commit77ae64b8abe89522d279068a8af8c5ba46aede1a
tree61fbf8b76b1e64bc840195a028d15c9f5fe415ae
parent5dcae734e58c08d4217756021ba5e54202d8dfea
removed leftover CVS conflict markers
ChangeLog
ChangeLog.pre-2-10